]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
theme-node: Rewrite switch statement
authorFlorian Müllner <fmuellner@gnome.org>
Wed, 23 Sep 2015 18:00:23 +0000 (20:00 +0200)
committerFlorian Müllner <fmuellner@gnome.org>
Wed, 23 Sep 2015 19:32:49 +0000 (21:32 +0200)
Some compilers warn about unhandled enum values in switch statements,
so don't use one where only two out of 21 possible values make sense.

src/st/st-theme-node.c

index 4c8fabd403a65a990950effc79fc9eeea80a922b..c109baeb18da675e41f7438bc5a793007adb2044 100644 (file)
@@ -840,26 +840,21 @@ st_theme_node_lookup_time (StThemeNode *node,
       if (strcmp (decl->property->stryng->str, property_name) == 0)
         {
           CRTerm *term = decl->value;
+          int factor = 1;
 
           if (term->type != TERM_NUMBER)
             continue;
 
-          switch (term->content.num->type)
-            {
-            case NUM_TIME_S:
-              *value = 1000 * term->content.num->val;
-              result = TRUE;
-              break;
-            case NUM_TIME_MS:
-              *value = term->content.num->val;
-              result = TRUE;
-              break;
-            default:
-              ;
-            }
+          if (term->content.num->type != NUM_TIME_S ||
+              term->content.num->type != NUM_TIME_MS)
+            continue;
 
-          if (result)
-            break;
+          if (term->content.num->type == NUM_TIME_S)
+            factor = 1000;
+
+          *value = factor * term->content.num->val;
+          result = TRUE;
+          break;
         }
     }